arif 23.11.2014
Merge origin/master