Release/0.3.1

Has fixes for #12 and #13