Merge pull request #1 from tlbdk/master