Updates from comments on pull request number 167. Marked as JBIDE-15618