oh god merging
Merge branch 'c' of github.com:ervanalb/noise into c