Fix merge errors
Merge pull request #13 from msafayasar/ShaneBranch

Fix merge errors