rAKA/old-master

bugfixes/documentation