Issue #49 comming along