Fixed Merge-Issue #4