Feature/#16 for12 may2014