release branches
Merge pull request #43 from varholl/release_1_fixes

release branches