bug_1040
Merge pull request #8 from kkorekk/bug_1040

bug_1040
Merge branch 'master' into bug_1039