Bugfix, YAY!
Merge pull request #308 from nekocoder/master

Bugfix, YAY!