Merge pull request #1 from WPAFC/master

merging to master