Merge pull request #172 from XhmikosR/master

Update mocha