tom was here
Merge pull request #12 from TomSp/master

tom was here