Completed and fixed #10