adding missing commits
Merge pull request #15 from conman246/styling

adding missing commits