some stuff from me
Merge pull request #72 from miketheman/mike_updates

some stuff from me