Fixed issue with conflicting typedef.
Updated version to 0.5.1.
Merge branch 'hotfix/0.5.1'