added 16
-15
Merge pull request #7 from meetor/master

+16, -15