Merge pull request #19 from ffainelli/master