merge changes
add changes
Merge branch 'master' of https://github.com/simonpatrick/simple