Merge pull request #48 from jburnham96/master

Updating dev_Richard