Merge branch 'flash1293-master'

Closes #790