Issue 50 - Mixonline

Issue 50