first commit
minor updates
Merge branch 'master' of https://github.com/m0t/scraps