Issue 4

close #4