i hate these messages
Merge pull request #1 from jmswen/master

i hate these messages