bug #814 - templates added

https://gist.github.com/aprzybyszewska/f25d0f64994fbd4adea4