Fix for TypeError #25
Merge pull request #28 from funkdified/master

Fix for TypeError #25