Bugfix Livetest
Merge pull request #25 from smiling-Jack/Working

Bugfix Livetest