jpivarski Merge pull request #17 from ReallyNiceGuy/master