Merge pull request #266 from ndawe/master

Fix #264