Don't make me wait
Merge pull request #49 from guywithnose/master

Don't make me wait