Merge pull request #5 from LEMS/development

Merging of development branch into master for NMLv2beta1
Removing unused component
Merge branch 'master' into development

* master:
  Removing unused component