Merge pull request #10 from vsvyatski/master