Changes due to s-ramp refactoring.
Merge pull request #6 from EricWittmann/sramp-expandedFromDocument

Changes due to s-ramp refactoring.