Revert "To heaven and beyond"

This reverts commit aa98f52d883f2037ad3c1cbf8cea2fbb6cb81212.
Revert "Revert "To heaven and beyond""

This reverts commit bd43e829cd61b5dd52cb10f9326f6843310a7b83.
Merge branch 'master' into gh-pages