Updated branch to reflect changes in boilerplate