1517
Merge pull request #8 from Luobata/master