Develop

[2014-12-09 13:11:00 EEvL] Pull Request current develop branch into master.
extract this to a method to avoid repeating code 3 times