Refactoring, add private constructors
Merge branch 'master' of https://github.com/mat1/apsicookie