Fixed some issues with 0.3.x (DR/GA)

Worked with Gary Allen
Tested the code with the calculator example
licence file updated