Merge changes from gdude2002/Pippi