Fixed Merge-Issue #7