Issue 129 with requested changes!