Finalized for delivery
Merge branch 'master' of github.com:gisvold/noahsprogark