migrate bug fix
Merge branch 'master' of github.com:1d20/softcycle