Merge branch 'master' into develop
updating the mit license
updating the mit license
Merge pull request #4 from rtorr/license

updating the mit license
Merge branch 'develop'