Fixes #56, Fixes #57, updated plugin.yml