Merge pull request #13 from eas604/master

integration 11-26