Merge pull request #388 from tobbad/master