Roadmap item #935
Merge pull request #38 from Wolframos/patch-1

Roadmap item #935