Completed Asana tasks:
* ZD #1723
Merge branch 'master' into zd-1731
Fixed missing letter in if
working on integer overflow solution
implemented suggestied to fix integer overflow
removed redundant code
Merge pull request #7 from pubnub/zd-1731

Zd 1731