Initial work
Use type instead of condition
Correct docblock
Fix docblock
Use plural form
Remove whitespace
Merge pull request #6 from Pico/migration

Migration