To solve the #161 issue
Merge pull request #164 from sexnothing/master

To solve the #161 issue