fixes #111
Merge pull request #114 from gecampbell/working

fixes #111