Pushing fixes developed on dev server

closes #3 
fixes #7