Update
Merge pull request #1 from Cdevenish/master

Merge trial commits