commit 237eae73e8151e6c24210e027aecf7c461ff0338
Merge: e0df856 72e457c
Author: Daniel Graziotin <daniel@ineed.coffee>
Date:   Wed Oct 4 08:47:50 2017 +0000

    Merge branch 'sasanj-mychanges'
