Merge branch 'master' into develop
Renamed namespace "Nirel" to "Amitayh"