Merge pull request #1214 from davvid/dev