added reloader
Merge branch 'develop' of https://github.com/mspangler/mars into develop