Commit 7cdcbd72c30a128afc6d69d05a3eb85cfb5555a3

eustas 2016-06-03T10:58:24

Merge pull request #360 from eustas/master Step 1: extract common