Dev

This has been merged but creating an official pull request to finalize.