Fix bug #28
Merge pull request #44 from puckipedia/master

Fix bug #28