#45 - Rft/issue 45

has been refactored.