Some minor changes done
Merge pull request #4 from amandziy/dev

Some minor changes done