Adding rbarnes and some minor changes
Merge pull request #4 from bifurcation/master

Adding rbarnes and some minor changes