Fixed Merge-Issue #2