Please merge ash/13w42 fixes for 13w42

This branch contains fix for  Issue #23  , Issue #24  , Issue #25  and Issue #26 

This is last submission of socioware-13w42 milestone.