fixed daniels bad code
Merge branch 'master' of https://github.com/dagus/Repo1