Bootstrapify things a bit.
Merge pull request #5 from nubs/master

Bootstrapify things a bit.