Issues/20

@btarakists please reiew