Updated 

Update to current version from Huy's repo