Add license
adding some berks
Merge remote-tracking branch 'upstream/master'