Merging new features

I really liked the changes you guys have added and would like to bring them into my version