fixed #69
Merge branch 'fix_69'