semi-merge of PRs #2 #3
changing indent from tabs to four spaces
fixing some two spelling mistakes