Merge pull request #11 from eas604/master

collecting integration changes