Solve issue #199
Merge pull request #200 from sexnothing/master

Solve issue #199
Merge branch 'master' into develop