Merge branch 'hotfix/1.0.1'
moved body content and added comments and logging for database calls
Merge branch 'hotfix/1.0.2' into develop