Revert "Revert "Revert "Merge pull request #1 from Pikuseru/to_merge"""

This reverts commit 92b59b782f7217e8e34460579f6680cf1ffc76fa.