few little changes not much
Merge pull request #5 from Kevinljh/michael

few little changes not much