Fix for #215 and some other related improvements

So everything okey?