carlie's attempt to commit
Merge pull request #3 from carlieh/master

Please sir accept this request
Merge remote-tracking branch 'upstream/master'