close #186
Merge pull request #190 from Logan676/bug

close #186
close #154
Merge branch 'master' of github.com:haiwen/seadroid