Merge pull request #13 from kiswa/master

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

Merge pull request #13 from kiswa/master