Update license
DRY!
Merges upstream development
Merge pull request #15 from betweenbrain/1.5-develop

Merge 1.5 develop