Revert "fix issue #29"
Revert "fix issue #29"

This reverts commit b310babbde1ec9f603fe67dd7c44ae7da54bf584.

smeeckaert/Sharrre,smeeckaert/Sharrre,smeeckaert/Sharrre,Julienh/Sharrre,joeyblake/Sharrre,joeyblake/Sharrre,joeyblake/Sharrre,Julienh/Sharrre,Julienh/Sharrre