* Build fixes
Merge pull request #40 from compscidictator/BuildFixs

 * Build fixes