Merge branch 'master' of github.com:jponf/wpm1py
Merge branch 'load-solver'