Start of new feature development - 0.5.0.0