Emulator: Refactored
Merge branch 'master' of github.com:svenstaro/uni-projekt