small changes
complete 0.3 version