A whole bunch of updates
Merge pull request #21 from cferdinandi/development

A whole bunch of updates