Merge pull request #43 from npostavs/master

Byte compilation, fixes for #29 and #30