Merge pull request #14 from HeikoAdams/master

Plugin contribution
Merge remote-tracking branch 'upstream/master'