Updated with latest updates from freerobby repo.