foundation commit
Merge branch 'master' of github.com:jaake/mark_petaccia