1.0
Merge pull request #1 from articstudio/1.0-branch

1.0