compile @Arelius's recent commits