Merge pull request #147 from mbeall/master

Flint 1.1.3