Merge pull request #15 from avogler/develop

Fix for issue #9, ensure compatibility with IDEA 12
Ensure compatibility with PHPStorm 7.1
Bump version number for next release