fixes AEROGEAR-1360 and AEROGEAR-1361
fixes AEROGEAR-1360 and AEROGEAR-1361
updated code examples in doc
updated doc