Merge pull request #375 from andyperlitch/master

fixes #367, improves reload time during dev on front