fixed #20
minor fixes