Robert Dabasi 15/12/2014
signature properly handled
Merge origin/master