adding the changes from the next version
Merge branch 'master' of github.com:warrenseely/robot