updates for beta 5
Merge pull request #91 from tLewisII/beta_5_updates

updates for beta 5