Merge branch 'nosync-update' into 'master'

Nosync updates

Closes #60 and #51

See merge request !102