some more porting
Merge branch 'master' of github.com:bachelor-2014/report
more porting
Merge branch 'master' of github.com:bachelor-2014/report