style
fixins
updating
Merge pull request #1 from alauderdale/updates_1

Updates 1