Fixing merge issues again
Merge pull request #23 from DemandCube/dev/kingofpoptart

Fixing merge issues again