Attempting to speed up library loading process
Added license and minor changes
Merge branch 'develop'