addition to the first part of the issue #32 implemented
Merge branch 'master' of https://github.com/leondart/FRaMED.git