Merge pull request #91 from lhein/master

fixed ECLIPSE-1076
fixed issue ECLIPSE-1082