Merge pull request #6 from bedevere/0.11

update to 0.11