Merge pull request #3 from frajasalo/master_fixing

Move the initialization of non-static member to the constructor