working on #8
fix #8
implementing feature

close #5