Close issues #2