Merge pull request #22 from kiswa/master

Merge master into dev