*NEW: #3
*NEW: #4
Merge branch 'master'; commit 'd6d7539' into dev1