add calendar api functionality
Merge branch 'master' into dev
api output fix