issue #85
issue #71
issue #73
Merge pull request #92 from objcow/master

For issue #85