fixed
Merge branch 'master' of http://github.com/indieboxproject/indie-gladiwashere