update docs
update docs
update docs
Merge pull request #23 from ablesky/dev

Merge dev to master