mods
Merge pull request #17 from bythink/master

20130713-2