Cleaned up code
Initial code for version 0.0.2