Merge pull request #159 from cvrebert/twbs-org-change