Sovle issue #150
Merge pull request #154 from sexnothing/master

Sovle issue #150