Merged #67 by @agarie