Renamed buffer to fn_buffer.
Corrected extension handling.
Fixed a small bug.
Merge remote-tracking branch 'origin/master'

Conflicts:
	name_pryer.py
Merge branch 'bugfix'