Version 1.0.1 - With Setup

Incorporated features and comments dated 20th May 2014.