Added cleanup support
Updated version to 1.1.3