Issue #152 - WIP (added initial feature)