BugFix for issue #2, #4, #5

Rock on