Merge pull request #1 from wggorking/portal

1