Merge pull request #52 from Cyan4973/dev

extra static assert, as suggested by @t-mat