Merge pull request #6 from nikobreyno/master

Pull request
Merge pull request #7 from nikobreyno/master

Pull Request
Storing of Family id into session
Merge pull request #9 from matmat007/master

Pull request