Build 1.1.4 - Cleaning up