Merge pull request #13 from blinktrade/master

typos
improving the user experience
Merge pull request #40 from pinhopro/development

Development
Merge pull request #5 from blinktrade/master

pulling changes from master