Merge pull request #1365 from psyborg55/master