Closes #11 along with minor tweaks
added post_save hook