Creation of dev branch.
Merge pull request #1 from hhy/dev

Merging with master.