Merge pull request #30 from paniash/master