Merge pull request #66 from lhein/master

fix for ECLIPSE-1055 and ECLIPSE-1059