Merge pr 11

[Do not merge yet]

Considering PR merge