Updated all classes and types
Merge branch 'dev' for 0.5.0 release