Working version
Merge pull request #1 from ptflea/working

Working version