Fixed fa-ul
Merge branch 'beta'