s
Merge pull request #27 from nicintosh/master

this thing is starting to work