Fix problem
Merge pull request #46 from cmanou/master

Fix