minor refactor
version 0.4.0