commit fe9b384793c4e79bd32133dc9053f27b75a5eeae
Merge: 2a257b7 1d5a688
Author: Florian Loitsch <floitsch@google.com>
Date:   Fri Sep 15 11:32:00 2017 +0200

    Merge pull request #52 from uburuntu/master
    
    Some refactorings: remove unused static, replace deprecated headers, init member in constructor