tot0 Merge pull request #9 from tot0/lupickup/lifeos