manually merge @toumitoun pull request closes #10