Merge branch 'master' into rel-0.2
Merge pull request #2 from mayankmisra/rel-0.2

Merge branch 'master' into rel-0.2