new way of plotting using plot methods
Updates from hui
Merge branch 'master' of https://github.com/sphaero/Concur