Fixes compilation errors: adds missing include, namespace.
Merge branch 'hotfix-0.1.2'