Merge pull request #1 from Mike-DTA/fix

new