Close issues #1