Fixing Solution
Merge pull request #27 from neurospeech/dev

Fixing Solution