Merge pull request #5 from nwwatson/master

Changes to get this sucker usable