1.1

updates
Merge pull request #2 from ArcQ/master

1.1