Merge pull request #4 from jwestfall69/master

Couple bug fixes for mono/linux, additional cleanup from file renames