Merge pull request #8 from ssmathias/develop

Merge tag '2.1' into develop