Merge pull request #12 from magicsepp/3.0