Merge pull request #46 from Paulche/master