finalizing
Merge branch 'master' of https://github.com/tnason/CoE1186
Merge branch 'master' of https://github.com/tnason/CoE1186