Bug fix on POC 3 19_12_2013

Bug fix on POC 3 from clent