Improvements made in devclub.eu 26.02.2013
Merge remote-tracking branch 'origin/master'