Merge pull request #7 from amida-tech/afsin

Afsin - Issue 310
Merge branch 'master' into afsin-issue-301
Tests for 133, it does not require any fix
Merge pull request #8 from amida-tech/afsin-issue-301

Afsin issue 301
Fix travis test failure (operator precedence)
Merge branch 'master' into afsin-issue-133
Merge pull request #9 from amida-tech/afsin-issue-133

Afsin issue 133 (node code change/test only)
Merge branch 'master' into afsin-issue-302

Conflicts:
	test/docscripts/test-api.js (corrected)