Updating enhancement

Merging dev with master for completion of #3.