refactored.
Version bump to 0.0.2