Pr/49

Edited version of #49