Merge pull request #2 from davidgwking/master

various best practices improvements