Update from OpenDTP project
Merge pull request #25 from OpenDTP/dev/ref#162

Dev/ref#162