Merge pull request #123 from komarad/3.0

3.0
Merge pull request #124 from komarad/3.0

3.0
!
Merge pull request #24 from H359/3.0

3.0