Bug fixes, updates...
Merge branch 'master' of https://github.com/heathkh/lifmtc.git