Merging master to dev: just released 1.0.beta