tried to fix naming issue
Merge branch 'master' of http://github.com/quinten991