yCanta/yCanta — pull request #26 by carlhemp (2014-11-22 20:15:03+00:00)
Title: Merge pull request #25 from yCanta/master

pull in new changes from master to yCanta 2