Merge pull request #5 from komarad/3.0

3.0
Merge pull request #7 from komarad/3.0

3.0
Intermediate commit
WIP
WIP
merge?
Merge pull request #1 from H359/3.0

3.0