Merge dev branch into master

Functional enough to be used (version 0.0.1) still need to add setup scripts.