Need two lines for git standard formatting
Merge pull request #57 from bpicolo/master

Need two lines for git standard formatting