Implementing Lih's code review
Merge pull request #19 from DemandCube/dev/kingofpoptart

Implementing Lih's code review