JBIDE-13209 for master
updated for unit test
Merge pull request #7 from robstryker/JBIDE-13209_master

JBIDE-13209 for master