Version 2.0

Corrected serious bugs