jbrisbin Merge pull request #2 from hansonkd/master