This is supposed to make sense right now?
Merge pull request #5 from strugglebus/master

This is supposed to make sense right now?