fixed wrong or missing namespaces and undeclared variables
Merge branch 'master' of https://github.com/GeoKnow/Jassa