Merge pull request #19 from madhawa-gunasekara/SYNAPSE-1104

Fix SYNAPSE-1104