Multiple fixes and improvements

Replaces #15 #18  target branch is now develop
implements #25 

I think i finally managed to get it right. Sorry for the build spam