Close #42

#37 must be done for v1.6