merge from: https://github.com/square/maximum-awesome