Fixed style bugs
Merge pull request #87 from jabbrass/fix/styleBugs

Fixed style bugs