Merge pull request #15 from jbholden/byron_develop

Byron develop
Merge branch 'byron_develop'