Merge pull request #89 from lhein/master

fixes for ECLIPSE-1073 and ECLIPSE-1074