Merging back to original repository

[jmsalvador2395]

Sibat is planning to jump back into this project so it is more appropriate this way