Merge pull request #1 from dixond1972/master

master to personal