fixed issues
Merge pull request #4 from lmcint/branch3

fixed issues