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

This reverts commit d36e962fd03c885d25c0ed1583dc0985706814da.