Apache license
Merge pull request #61 from tomrozb/develop

Apache license