validations adding
pulling isaac branch with anuvis's branch

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