Merge pull request #118 from jonezy/master

refactored a bunch of stuff, some new model images.