e16
auto merge of #104 : barosl/test-1/e16, r=barosl