Fixes #12
Some fixes for Issue #10
Some fixes for Issue #10
Fixes #22
Some fixes for Issue #10
fixes #10
Fixes #26
Update README.md
merging master/develop