Fixed bugs/typos #55
Merging