Last changes and final push
Merge branch 'master' of github.com:gavinpham/Tumbler