Merge pull request #1 from floodlight/master

Syncing with floodligh/loxigen