Merge pull request #32 from vsvyatski/master