Merged from master
Merge branch '1.0' of github.com:CraZySacX/overbuild into 1.0