Merge pull request #1 from txthinking/master