Removing deprecated code
Merge pull request #20 from safaci2000/master

Removing deprecated code