Unfriendly numbers added
Merge branch 'dev-ubuntu'