pushed to version 0.5, refactor some filenames and functions