Proposed changes

I've developed a new feature here. Do you wanna merge?