Fix incorrect initialization order.
Fix class/struct mismatch.
Merge pull request #5 from denravonska/master

Fix build errors with Clang