Merge master into 1.9

Master is merged into 1.9 for Issue #5 and #6 changes