Revert ad396cb..9c1e203

This rolls back to commit ad396cbb4b18b44b38a55cb735d15f0de4d47354.
Merge branch 'master' of https://github.com/loydvan/loydvan

Conflicts: