Merge pull request #16 from RicterZ/master

marge dev and master
Merge pull request #19 from RicterZ/dev

Merge pull request #16 from RicterZ/master