Fixing foundation includes, adding elements from boilerplate:
Merge branch 'develop'