Various changes to 1b
Merge branch 'master' of github.com:aduston/shakesy