Merge pull request #1 from RobJohansen/master

yeaaaaaaaaaaaAAAAH