SOme changes

Change-Id: I3107583b002cae9a0e496ee83a2f513c5afd28ca
Signed-off-by: Andrey Shamis <lolnik@gmail.com>
Merge branch 'master' of github.com:AndreyShamis/sls