please merge Issue#39

#39