merge #60 to beta