Update from Master

My first merge on GitHub ,-)