Merged with changes from https://github.com/UnquietCode/JCodeModel