implemented #49
Merge pull request #143 from drummer3333/ticket_49

implemented #49