Merge pull request #114 from komarad/3.0

3.0
Closes #111
Merge pull request #115 from komarad/3.0

3.0
Merge pull request #20 from H359/3.0

3.0