Merge pull request #7 from sujy/master

Merged.
Merge remote-tracking branch 'VenDream/master'