Dev

fixes #13 resolves #12 and fixes #6