Version bump to 0.0.8
refactoring code