Improved formatting and removed  empty check so emails get sent
Fixed conflict between duplicate  vars
Updated version number to 1.0.5