Merge pull request #12 from BFALacerda/master

Looks good to me, and is necessary for Marc's new install files.