styling
merge fix
Merge pull request #4 from Jonga/jordansbranch

Jordansbranch