Fixes by @jwarkentin
Merge branch 'master' of github.com:dscape/cycle

* 'master' of github.com:dscape/cycle:
  Update cycle