Robert Dabasi 15/12/2014
with some sort of signature recording (no screen rotation)
Merge origin/master