New master

Is there any reason why this pull request hasn't been submitted/merged already? @rockymeza