Fixed a remaining Ubuntu 14.04 upgrade bug

Fixes issue #2 and #3.