Merge pull request #106 from dinkc64/master