Dev v0.3.1

Merging Dev v0.3.1 to master branch.