pull request accepted, back to jbaiter/master