fixed name conflict
updated changes
added contributors
Merge branch 'master' of github.com:Stiivi/cubes