Merge pull request #26 from ablesky/dev

Merge dev into master
Merge pull request #27 from ablesky/dev

Merge dev into master
Merge pull request #28 from ablesky/dev

Merge dev into master
Merge pull request #29 from ablesky/dev

Merge dev into master
Merge branch 'dev'