Updates 22.08.2014: issues fix
Merge origin/master