Updated classes for 0.4.1 release
Merge pull request #2 from abesco/development

Release 0.4.1