fixes
Merge pull request #4 from surangak/fixes123

fixes