Merge pull request #3 from Treggats/v0.3

[V0.3] handlebar fixes