#41 resolved
#42 resolved