pull v3
Merge branch 'master' of github.com:spl7387/liftupv1
spl adj changes