see issues #13 and #14 (still conflicts)