Merge tag 'v1.0' into develop

Initial Version
adding some bullet proofing on calc and better inputs
Merge branch 'release/v1.1'