Additional compiler service options

This combines pull request #82 and #83 as I noticed that there is a merge conflict if both are merged. So if you are happy with both of them, you can just merge this one.