fixed stupid bug..
Merge branch 'bugfix'
Merge branch 'master' of github.com:ldevesine/Calvin