minor fixes before life
Merge pull request #3 from mattcarlos/master

minor fixes before live