Changes
Merge pull request #13 from lc2958/master

Changes