fixed ECLIPSE-1076
Merge pull request #91 from lhein/master

fixed ECLIPSE-1076