Merge branch 'nkupdates' into 'master'

Cleanups and bugfixes

See merge request !36
1 job for v0.2.0 in 1 minute and 34 seconds
latest