bug fixes
Merge branch 'V2.1.0' of https://github.com/getkickbak/KICKBAK into V2.1.0