To infinity... and beyond
Merge pull request #414 from bazz2/master

To infinity... and beyond