Fix model bugs
Bump to 0.0.6
Merge develop