Organization and merged huderlem's pull request