Merge from Dpoggi fork

These are great additions!