Merge pull request #12 from foresmac/master

The Lost Boys
approximately this
Merge pull request #13 from StoicJester/master

approximately this
He also said this.

To Clair. In an elevator.