Merge #14+15

Merge #14+15