Fix previous issue #76 fix
Merge pull request #81 from wajam/manu-fix-issue76-fix

Fix previous issue #76 fix