Merge pull request #30 from data-licious/master

Some fixes