release branches
Merge pull request #43 from varholl/release_1_fixes

release branches
Merge pull request #44 from varholl/development

Release 1 Bugs