0.3.5 updates
Merge pull request #112 from BobPalmer/DEV

0.3.5 updates