Merge pull request #101 from jmdobry/3.0.0

3.0.0-beta.1
Fixes #105.

Stable Version 3.0.0-beta.2
Stable Version 3.0.0-beta.3

Fixed #106
Stable Version 3.0.0-beta.4

Fixes #103

Fixes #107