feature: #6 + little fix