Master

Merge my master with the main master.