Merge working version to master - this is official v1.0, hurray