cleanup, addd package
merge with master