everything is working now
Merge pull request #7 from andyboutte/master

everything is working now