Minor fixes
Merge pull request #11 from MulgaSoft/dev

Minor fixes