Feature #66, added MIT license
Merge branch 'feature-66' into develop