close #2 Fixed.
Merge branch 'wip/1.1'