Revert "Salomon branch"
Merge pull request #4 from SalomonKoen/revert-2-Salomon-Branch

Revert "Salomon branch"