#42 merged to dev