v0.10beta - adds many features, closes #4 and closes #7
Merge remote-tracking branch 'origin/master'