Issue #152 - WIP (added initial feature)
Issue 152: WIP