New version that includes sources to work with gwt unit