Tweaking some things (mainly working on copypaste).
Merge remote-tracking branch 'origin/master'