Merge pull request #7 from LauraOniga/unstable

Please do not look on this commit it's nothing fun to see here :)