Merge pull request #24 from ablesky/dev

Merge dev to master
Merge pull request #25 from ablesky/dev

Merge dev to master