#115 Issue implemented