handle error
Merge branch 'master' of github.com:10sr/junks