Merge branch 'patch-1' of git://github.com/lapilofu/philo into develop