Added feature #1
Fixed spelling errors
Merge branch 'feature1'