Merge pull request #297 from ndawe/master

Fix #296