Revert "Merge branch 'new' into 'master'"

This reverts merge request !6 (merged).

Reversion of mistake:

1. Not working on some computers
2. Unintentional removal of acronyms