update on #92 and other issues
Merge pull request #96 from microweber/0.759

update on #92 and other issues