Version 2.0 - Bugs fixed and fine tuning