Temporary fix for issue #8

Dirty hack but it works well, see #8 for more information
Merge pull request #19 from Spl3en/master

test