bugs fixes
bugs fixes
Merge pull request #1 from dignajar/master

updates from original