License changed to allow commercial applications (refactor)