Merge pull request #23 from jnvance/development Development
Merge branch 'development'
Merge pull request #3 from jnvance/development Refactoring of the original serial code