Fixed some stuff
Merge branch 'develop' of https://github.com/interopbyt/scribbles into develop