Working on fix for issue #8, but cannot test results.
Fixed issue #10
Merge branch 'c1moore_branch' into dev
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev