last updates from class
Merge branch 'master' of https://github.com/shawnlawson/ACI_F14