issue54
Merge branch 'issue55'