changes related to Issues/13 Issues/14

please merge with master if all OK. branch tested on jenkins. #13 #14