Merge pull request #3 from kesapojat/master

Cohesive code style and fixed validation message typo
Merge remote-tracking branch 'upstream/master'