Fixed #31, actually this is second try :)