a promising patch for Issue #55
Merge branch 'dev'