Merge pull request #240 from nmav/master