Merge pull request #32 from bernardobrezende/master

fixing language bug + merge from cwi + mine origin
fixed #21 - adding h5 for 'beta'.