Some fixed for the prototype
Merge pull request #46 from Shurouq/merge-with-original

Some fixes for the prototype