debugging
Merge pull request #24 from myi100/master

debugging