Merge pull request #86 from AnyFetch/hotfixes

Bug fixes
Merge branch 'new-app' into document-full