Merge pull request #19 from Tarnadas/master