Merge pull request #92 from lhein/master

fixed issue ECLIPSE-1082