Code refactoring
Version bump to 0.2.9