Merge pull request #16 from mikem5/master

used version 2 for 08.03 and did cleanup on others
A few solutions added.
readability changes