Revert "Revert "Commit changes from master and myself""

This reverts commit 7314765ce1f4bc66ba1f99ff2a192ed7e2e80230.
Revert "Revert "Commit bootstrap""

This reverts commit c2f91fb4b4bdc797da1fcb059ff734c0dad8fb80.
Revert "Revert "Commit latest changes""

This reverts commit 59af645227e0497dd5f51c8bfd1000153c32f191.