Merge pull request #4 from nubecoder/dual-binaries

Miscellaneous (minor) changes.
Merge pull request #2 from morfic/dual-binaries

Merge pull request #4 from nubecoder/dual-binaries