Merge pull request #21 from CraZySacX/master

Fix for rust commit 3dcd2157403163789aaf21a9ab3c4d30a7c6494d 'Switch to ...
Rename enums and variants with namespacing in mind