Fix matrix ptr functions
Merge branch 'develop' into hotfix/0.2.1
Merge branch 'hotfix/0.2.1'