Integration bug fixes
Merge pull request #47 from DemandCube/dev/kingofpoptart

Integration bug fixes