Merge pull request #494 from ndawe/master

minor bugfix