fix #40, added Apache 2 license
Merge branch '40-license' into devel