some changes for last stable version 0.01