Merge pull request #8 from scboucher/merge/1

Merge/1
Fixed formatting and renamed method
Added gitignore
Merge issue