Merged from SrMonedero-master