Fixes #428
Merge pull request #429 from sumobi/issue/428

Fixes #428