Merge pull request #1 from twip/master

a