Merge pull request #1 from kjarrio/master

Added a few features
Formatting - pushing update to plugins.jetbrains.com
Merge pull request #1 from jonstaff/master

Changes