#50

Pullrequest related do #50