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