Development

@zemariano
he applied some interesting changes