Solved issue #12 and bumped the Plugin version to 0.9.7.