minor changes
Version 1.12.1, Revision 4
Merge branch 'dev'