Fixed Merge-Issue #3