Added Advanced Calendar Support

Added Document Support
Bugfix: Comments