Merge pull request #22 from kiswa/master

Merge master into dev
Merge pull request #28 from kiswa/dev

Merge pull request #22 from kiswa/master