Merge pull request #485 from mtausig/master