Merge pull request #168 from miyasakago/master

issues #138 , issues #161
Merge branch 'master' of https://github.com/endosnipe/ENdoSnipe