insert, update shortcut syntax added (see test.txt for changes)
Merge branch 'develop'
test refactored
Merge branch 'develop'
version 4.1