Formatting
Fixes #6
Merge pull request #1 from danieldisu/master

Code Formatting and Fixes Bug #6