Fixed typos and prepared for merge with master