Merge pull request #1 from neurospeech/dev

Working version 1.2.1 merged with master
Fixed Typo
Merge pull request #2 from neurospeech/master

Fixed Typo