Issue 171  (merge to dev)