Start of new feature development - 0.4.0.0