minor changes
Merge branch 'master' of github.com:jbsmith86/Carbon