smile :)
Merge pull request #13 from UBC-VCL/ls-lions

smile :)