Merge into master from pull request #34:
Small fixes (https://github.com/floodlight/loxigen/pull/34)