updated licensing and documentation
merge from master