Merging changes from develop branch

These changes have already been reviewed and merged on the aedmonds repository.