addressing #10
first version of #10, fixed #68