Merge pull request #28 from abcsoftwork/master

Fixing bugs and adding features.