Version 0.3.1 and minor package changes