refactored a bit
Merge branch 'master' of github.com:jrd730/IGV_Simulator