Fix #28
Merge pull request #30 from GUIpsp/master

Fix #28