Closed issues #12 #10
Closed issues #12 #10