Merge tag 'v1.2' into develop

Removing fancyInput and fixing inputs for consistency
fixed incorrect math!
Merge branch 'release/v1.3'