Merge pull request #3 from afarris/master

mostly styles changes and a 1-2 functional changes
Merged pulls
fixed line break int