Fixed bugs
Merge branch 'master' of https://github.com/integralhero/rally
merge