Bumped dev-master to 1.1
Merge pull request #11 from chives/dev

Bumped dev-master to 1.1