Working version
Merge pull request #2 from ptflea/working

Working version