commiting all for EAB
Merge remote-tracking branch 'origin/0.1.1a' into 0.1.1a_v1