this this justin's latest version for testing, all works
Merge branch 'master' of https://github.com/Zinfidel/cs554-project1