refactored bin finder and bug fixes for 2.2 / 2.3
Merge pull request #3 from danblundell/dev

refactored bin finder and bug fixes for 2.2 / 2.3