Merge pull request #31 from sustr4/specupdate

Mostly specs, some still WIP (i.e. failing at the moment)