Merged with pull request of mrbi11