Prepared for 0.3.1 version