Updated to address changes made between the initial commit and release version