bugfix
Merge pull request #12 from craiganderson/master

bugfix