latest changes
Fixed solver conflict
Merge branch 'master' of https://github.com/abulovic/binner
Put back to Loaction