Pull req for staging version 0.3.1