Fix #53, improve version compatibility