few changes
Merge pull request #2 from architv/dev

few changes