Merge pull request #53 from lokulin/Indev

Merging pull request