Fixing issue #190.
Merge branch 'develop' of https://github.com/EmilyBjoerk/lsml into develop