Mariomarco's further development

to see all updates, look at release 0.7