candelibas Merge pull request #27 from fkirc/master