Merge remote-tracking branch 'origin/pr/1' into ms08_067_check
Merge remote-tracking branch 'origin/pr/2' into ms08_067_check
Merge pull request #3 from wvu-r7/pr/2848

Fix even moar outstanding issues
Added credits and clean initialize

Added wvu to creds as he did most of work. ;)
Clean up formatting