Underscore as word boundary
Merge branch 'master' of github.com:dbellavista/linux-stuff