Merging Aaron's dev branch with the master

obsoleting alpha v0.6, adding Aaron's commits with JSON