Fix input names
Merge branch 'master' of github.com:damir-clearscale/RightScale