changes
polish
Merge pull request #2 from harryosmar/testing_branch

Testing branch