Merge pull request #23 from chris-ramon/bin-dir-improvements

Merge pull request #23 from chris-ramon/bin-dir-improvements #59