some stuff I forgot
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev