FIX: Issue #4 and #5