Merge pull request #50 from raphidlee/JUNEAU-156

JUNEAU-156