Merge pull request #1 from Timeswitch/dev-merge

Upstream Update
Merge pull request #16 from Cluster7ck/dev-merge

Upstream Update