Start of new feature development - 0.2.0.0