Pull req for production version 0.3.1