Merge pull request #2 from bahuma/master

Merge master into dev