Fixes #2 and #3
Fixes #25
Merge branch 'fixes/xbox' into develop