fixed stuff that should be in a namespace
Merge branch 'master' of github.com:nguillemot/valkyrie