Merge minor Changes
Merge branch 'master' of https://github.com/Fannon/AmVis
Refactoring++