Sorry my Commit seem to overwrite your code

Look at the commit #71 and added it to my code it should work, will need
to double check