Fix Issue #2
Fix #3
Fix #4
Merge pull request #5 from penguinho/master

Fixing All Open Issues