Merge @maniac103 changes