Closed many issues on Github#2