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