Add from Mingu's project source

Need to edit for original project