mike made more changes
Merge pull request #3 from malloryreuls/mike

mike made more changes