Fixed Merge-Issue #5