Development

@barnabyalter @hab278
Please take a look at this pull request and make any comments. I plan to merge at the end of the day.

Thanks,
Scot