Release 3.0
Merge pull request #14 from dapil/dev

Release 3.0