Merge pull request #35 from Jyrno42/master

fixes for code
Merge pull request #36 from Jyrno42/live

Merge pull request #35 from Jyrno42/master