Created by: ramereth
I've reverted the previous builds that were having issues and also made a few enhancements.