added #44
added #46