commit by jayli
Merge pull request #49 from jayli/master

bugfix for 1.1