Merge pull request #1 from hoggypig/master2

Thanks2