Version 0.0.2

General code upgrade.