fixed transitions a bit more
Merge pull request #42 from lapty/master

fixed transitions a bit more
changed serving sizes.. still needs some work