Merge pull request #22 from abcsoftwork/master

Fixing known errors.