Merging small changes to level 3
Merge branch 'master' of github.com:decwong/Cocooned