Merge pull request #52 from uburuntu/master

Some refactorings: remove unused static, replace deprecated headers, init member in constructor