Updated version 0.3.5