Retreat Fixed?

#70
Merge branch 'master' into gh-pages