Changes name to include Free
Merge branch 'issues/4' into dev