updating spyrossak with changes from master