CR-changes
Merge pull request #1 from maxmode/master

CR-changes