Fix Makefile
Call ffi::glfwTerminate only if necessary
Merge pull request #96 from bjz/fixes

A couple of fixes