Changed to Apache License
Added StubBuilder