Updating dev build:
May contain fix for #63 - needs testing