Add validation and style fixes
Merge pull request #1 from jwennerberg/master

Add validation and style fixes