Indentation was added, fixed bug when keyword was last word on the line.
Merge pull request #11 from Madzi/master

Bug fixed and new functionality was added