chochen 09-13 added
Merge pull request #31 from dmode/master

chochen 09-13 added