Merge pull request #5 from floodlight/master

merge