upgraded to version 2.0.0 beta and began addressing some issues from #2