close #18
merge
just some view update