Updating khamer/boilerplate with imarc/boilerplate