Issue #2 and other formatting issues resolved.
Merge pull request #11 from am11/master

Issue #2 and other formatting issues resolved.