clean up
Merge branch 'master' of https://github.com/a1247418/stoberry