CS-4815
CS-4815 should now be complete
Merge pull request #11 from terwey/patch-2

CS-4815