chaneged variable naming
Merge branch 'master' of github.com:Bricco/sheldon