Fixing typography
Fixing conflicts
Merge pull request #3 from alcatrazia/master

Fixing typography