Fix Issue #4 ;)
Fix Issue #5