issue35: fixed the 'one-click lag'. This was caused by improper function calls. See issue chart for more details
Resolved conflict with merge of issue35 into dev