Updated git submodule and use 0.6.5+ package style
Don't use submodule due to var restriction, have to modify the source anyway