From older commits: fix #3 , fix #4 ; from this commit: close #1 , fix #4
From older commits: fix #3 , fix #4 ; from this commit: close #1 , fix #4