merged trial into develop
Merge pull request #10 from sdh16/develop

merged develop into master