Ver 0.3.1

Small changes to make system more robust