Merge pull request #1 from thinktecture/master

Update from original