Merge pull request #7 from floodlight/master

Pull from floodlight