Show last line's number (fixing issue #24)
Merge branches 'stritt' and 'master' into tmanderson/master
Merging more fixes, thanks @smatter0ne