change by user2
Merge pull request #1 from mikepaisner/Issue000002

change by user2
Merge branch 'master' into Issue000001