Merge pull request #2 from changbl/working

Two changes
fix a bug in allinone environment template