Merged in develop (pull request #35)

Fix mercurial hook, issue #88