checking dump
check dump out
heh
fixing bugs
nothing's special
Merge branch 'dev'