Added changes from my fork

Here are the changes I made in my fork last week.