Imported to IntelliJ
Merge pull request #1 from Soabirw/master

Imported to IntelliJ