Fixing issue #29
Fixing issue #32
Merge branch 'master' of https://github.com/EmilyBjoerk/lsml