fix for export
Merge branch 'front' of github.com:runnez/niva into front