Little stem fix
Merging feature/wiktor and including memo parser fixes.