Merge pull request #13 from bill-looby/samples-fixes

Fix all issues with the rampart-samples