Cleaner code
Updated assembly version: 1.0.4.0