Fix for Issue #61
Merge branch 'master' of https://github.com/euphorie/Euphorie