fixes #4
fix #3
close #3, close #4