Issue 16

Close #16