More changes, I'm updating my branch (merging devel into my branch)