Bugfixing and namespace update to revision 0.2.0