Merge pull request #1 from quickcall/dev

Dev branch created
Merge pull request #2 from quickcall/master

Merge pull request #1 from quickcall/dev