Merge pull request #24 from Jyrno42/master

Update version
Merge pull request #25 from Jyrno42/live

Merge pull request #24 from Jyrno42/master