Puntis dev

Hey guys, 

I made minor modifications in my code..we just have to merge it with the master branch!