Merge pull request #50 from cmanou/master

revert
Oops