Issue 129 Implementation

#129 Issue implemented