Version 0.3.1

Merged in changes from master