Merge pull request #56 from svanharmelen/f-list-with-vpcid-option