Fix issue#31
Fix typo
Improve for intellij 14