fixes #60
Merge remote-tracking branch 'origin/applications' into applications