fix namespace and docblocks
update changelog
Merge branch 'hotfix/0.1.1'