Merge pull request #390 from chuchuva/2.0