test pull request 2
Merge into master from pull request #3:
test pull request 2 (https://github.com/floodlight/indigo/pull/3)