final working version.
Merge branch 'master' of https://github.com/dlroggow/cpre480x