Fixed Issues #1-#4