Needs a bit more testing before releasing version 0.4.0