merge request

This is the pull request to merge roadt_master (all code i commit) to master!