Merge pull request #1 from frankV/master

Please take my sauce.