Merge pull request #147 from mbeall/master

Flint 1.1.3
Merge pull request #11 from starverte/master

Merge pull request #147 from mbeall/master