Fixes for API changes to make it work in Intellij IDEA 12.
Merge pull request #1 from SpOOnman/master

Fixes for API changes to make it work in Intellij IDEA 12.