Merge pull request #13 from kiswa/master

Merge master into dev