Merge branch 'develop' of git://github.com/melinath/philo into develop