Added fixes from pull #15
Added fixes from pull #15

juvchan/DevCamp,opsgility/DevCamp,LadyNaggaga/DevCamp,ovishesh/DevCamp,hsirtl/DevCamp,SvenAelterman/DevCamp,mikevh/DevCamp,Stijnc/DevCamp,Inovativ/DevCamp,hsirtl/DevCamp,Inovativ/DevCamp,ovishesh/DevCamp,Inovativ/DevCamp,Azure-Readiness/DevCamp,SvenAelterman/DevCamp,LadyNaggaga/DevCamp,opsgility/DevCamp,mikevh/DevCamp,juvchan/DevCamp,CedarLogic/DevCamp,CedarLogic/DevCamp,CedarLogic/DevCamp,Stijnc/DevCamp,mikevh/DevCamp,opsgility/DevCamp,LadyNaggaga/DevCamp,ovishesh/DevCamp,SvenAelterman/DevCamp,Azure-Readiness/DevCamp,Stijnc/DevCamp,Azure-Readiness/DevCamp,hsirtl/DevCamp,juvchan/DevCamp