Merge pull request #4 from nubecoder/dual-binaries

Miscellaneous (minor) changes.