Added schedule and fee calculations
Merge branch 'develop'
Release 1.1.2