Osmosis Fixes

DOC-26
Merge pull request #94 from rockettheme/staging

Osmosis Fixes