Merge pull request #61 from arax/0.5.x

[Urgent] Fixed broken ON templates for compute