v1.0 beta2
v1.0 beta2 merged
v1.0 beta2 interface merged with model