Merge done, close Issue #9