Merge pull request #1110 from psyborg55/psyborg55-patch-1