refactoring code, need to fix apply issue
used workaround for apply call, bumped to 0.4.0
Merge branch 'feature/2'