18 module ataru

hi Team, 
have a look if the changes solve #18 already.