closed #42 and #49