Merge pull request #25 from yCanta/master

pull in new changes from master to yCanta 2