debug
Merge pull request #25 from myi100/master

debug