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