Ver 0.4

Added enable and disable functionality; small bug fixes