Merge pull request #30 from greearb/master