rebase master

rebase for #75