Initial submission
Merge pull request #1 from simonfraser1/master

srf's Initial submission