Solver + general functionality
Merge pull request #15 from Tesple/tesple-dev

Solver + general functionality