fixed: #5
cleaning up