Added borders
Save as .png if the given extension doesn't make sense
Added tabs
Merge branch 'png'