Merge pull request #16 from RicterZ/master

marge dev and master