close #27, #9 added signature for @KaspYar