Another buffer bug fix
Slight change to alignment function that causes endless loop sometimes
Merged master to SendDataOverSockets