Fix and Updates
Merge pull request #22 from pglibay/master

Fix and Updates