Merge pull request #2 from bahuma/master

Merge master into dev
Merge pull request #3 from bahuma/dev

Merge pull request #2 from bahuma/master