Added configless feature
Merged configless branch into master
Merged configless branch into master