fixed merge conflict
Merge branch 'master' of github.com:fanvio/slap1