Fixed and Featured #38
Merge pull request #39 from Acquisto/fixed

Fixed and Featured #38