bugs fixed
2014.05.22 Bastian and Alex's email